Revision: bazaar--devel--1.4--patch-15
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Fri Apr 15 15:36:07 EST 2005
Standard-date: 2005-04-15 05:36:07 GMT
Modified-files: libarch/apply-changeset.c libarch/diffs.c
    libarch/diffs.h libarch/make-changeset.c
    tests/test-merge.sh
New-patches: robert.collins@canonical.com--general/bazaar--devel--1.4--patch-15
Summary: bugfix three-way patch application, symlink adds when the symlink exists are not conflicts if the target is the same.
Keywords: 

